From a4ab0dd44c9d7d34b48f53de9ce4c7ed4a0a12fa Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Thu, 11 Mar 2004 17:54:19 +0000 Subject: [PATCH] don't overwrite application properties. Fixes bug #136802. 2004-03-11 Mark McLoughlin * gtk/gtksettings.c: (apply_queued_setting): don't overwrite application properties. Fixes bug #136802. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtksettings.c | 7 +++++-- 6 files changed, 30 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f073b5b830..7c2dd6689e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-03-11 Mark McLoughlin + + * gtk/gtksettings.c: (apply_queued_setting): don't overwrite + application properties. Fixes bug #136802. + 2004-03-11 Dov Grobgeld * gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f073b5b830..7c2dd6689e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-03-11 Mark McLoughlin + + * gtk/gtksettings.c: (apply_queued_setting): don't overwrite + application properties. Fixes bug #136802. + 2004-03-11 Dov Grobgeld * gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f073b5b830..7c2dd6689e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2004-03-11 Mark McLoughlin + + * gtk/gtksettings.c: (apply_queued_setting): don't overwrite + application properties. Fixes bug #136802. + 2004-03-11 Dov Grobgeld * gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f073b5b830..7c2dd6689e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-03-11 Mark McLoughlin + + * gtk/gtksettings.c: (apply_queued_setting): don't overwrite + application properties. Fixes bug #136802. + 2004-03-11 Dov Grobgeld * gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f073b5b830..7c2dd6689e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-03-11 Mark McLoughlin + + * gtk/gtksettings.c: (apply_queued_setting): don't overwrite + application properties. Fixes bug #136802. + 2004-03-11 Dov Grobgeld * gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index ef2fb2e041..e6e423fa59 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -684,8 +684,11 @@ apply_queued_setting (GtkSettings *data, if (_gtk_settings_parse_convert (parser, &qvalue->public.value, pspec, &tmp_value)) { - g_object_set_property (G_OBJECT (data), pspec->name, &tmp_value); - data->property_values[pspec->param_id - 1].source = qvalue->source; + if (data->property_values[pspec->param_id - 1].source <= qvalue->source) + { + g_object_set_property (G_OBJECT (data), pspec->name, &tmp_value); + data->property_values[pspec->param_id - 1].source = qvalue->source; + } } else { -- 2.30.2